diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c
index 2a5f1bb363..7946e90aea 100644
--- a/src/cpu/x86/smm/smihandler.c
+++ b/src/cpu/x86/smm/smihandler.c
@@ -8,6 +8,7 @@
 #include <cpu/amd/amd64_save_state.h>
 #include <cpu/intel/em64t100_save_state.h>
 #include <cpu/intel/em64t101_save_state.h>
+#include <cpu/x86/lapic.h>
 #include <cpu/x86/lapic_def.h>
 #include <cpu/x86/legacy_save_state.h>
 
@@ -50,11 +51,6 @@ static void smi_release_lock(void)
 	);
 }
 
-static __always_inline unsigned long nodeid(void)
-{
-	return (*((volatile unsigned long *)(LAPIC_DEFAULT_BASE + LAPIC_ID)) >> 24);
-}
-
 void io_trap_handler(int smif)
 {
 	/* If a handler function handled a given IO trap, it
@@ -164,7 +160,7 @@ void smi_handler(void)
 
 	smi_backup_pci_address();
 
-	node = nodeid();
+	node = lapicid();
 
 	console_init();