diff --git a/machine/src/arch/aarch64/cpu/boot.rs b/machine/src/arch/aarch64/cpu/boot.rs
index b1a66b8..752b186 100644
--- a/machine/src/arch/aarch64/cpu/boot.rs
+++ b/machine/src/arch/aarch64/cpu/boot.rs
@@ -10,6 +10,7 @@
 
 use {
     super::endless_sleep,
+    crate::platform::cpu::BOOT_CORE_ID,
     aarch64_cpu::{asm, registers::*},
     core::{
         cell::UnsafeCell,
@@ -54,8 +55,6 @@ macro_rules! entry {
 #[no_mangle]
 #[link_section = ".text.main.entry"]
 pub unsafe extern "C" fn _boot_cores() -> ! {
-    const CORE_0: u64 = 0;
-    const CORE_MASK: u64 = 0x3;
     // Can't match values with dots in match, so use intermediate consts.
     #[cfg(qemu)]
     const EL3: u64 = CurrentEL::EL::EL3.value;
@@ -72,7 +71,7 @@ pub unsafe extern "C" fn _boot_cores() -> ! {
 
     shared_setup_and_enter_pre();
 
-    if CORE_0 == MPIDR_EL1.get() & CORE_MASK {
+    if BOOT_CORE_ID == super::smp::core_id() {
         match CurrentEL.get() {
             #[cfg(qemu)]
             EL3 => setup_and_enter_el1_from_el3(),
diff --git a/machine/src/arch/aarch64/cpu/smp.rs b/machine/src/arch/aarch64/cpu/smp.rs
index b6a029f..a8b3649 100644
--- a/machine/src/arch/aarch64/cpu/smp.rs
+++ b/machine/src/arch/aarch64/cpu/smp.rs
@@ -1 +1,7 @@
-pub fn core_id() {}
+#[inline(always)]
+pub fn core_id() -> u64 {
+    use aarch64_cpu::registers::{Readable, MPIDR_EL1};
+
+    const CORE_MASK: u64 = 0x3;
+    MPIDR_EL1.get() & CORE_MASK
+}
diff --git a/machine/src/platform/raspberrypi/cpu.rs b/machine/src/platform/raspberrypi/cpu.rs
new file mode 100644
index 0000000..484d013
--- /dev/null
+++ b/machine/src/platform/raspberrypi/cpu.rs
@@ -0,0 +1 @@
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs b/machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs
index af6ef04..6bbd235 100644
--- a/machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs
+++ b/machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs
@@ -80,8 +80,8 @@ mod gicc;
 mod gicd;
 
 use crate::{
-    bsp::{self, device_driver::common::BoundedUsize},
-    cpu, driver, exception,
+    bsp::{self, cpu::BOOT_CORE_ID, device_driver::common::BoundedUsize},
+    cpu, drivers, exception,
     synchronization::{self, InitStateLock},
 };
 
@@ -147,7 +147,7 @@ impl driver::interface::DeviceDriver for GICv2 {
     }
 
     unsafe fn init(&self) -> Result<(), &'static str> {
-        if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
+        if BOOT_CORE_ID == cpu::smp::core_id() {
             self.gicd.boot_core_init();
         }
 
diff --git a/machine/src/platform/raspberrypi/mod.rs b/machine/src/platform/raspberrypi/mod.rs
index 44150c7..8a5e7dc 100644
--- a/machine/src/platform/raspberrypi/mod.rs
+++ b/machine/src/platform/raspberrypi/mod.rs
@@ -5,6 +5,7 @@
 
 #![allow(dead_code)]
 
+pub mod cpu;
 pub mod device_driver;
 pub mod display;
 pub mod drivers;