Index: kernel/arch/ia32/src/smp/mps.c
===================================================================
--- kernel/arch/ia32/src/smp/mps.c	(revision 263bda21cd3cd48db6a7af349e737c62847da815)
+++ kernel/arch/ia32/src/smp/mps.c	(revision 4edd57fdd301e5105dd61b632079e978c001e6e6)
@@ -85,8 +85,8 @@
 	/*
 	 * FIXME: The current local APIC driver limits usable
-	 * APIC IDs to 8.
+	 * CPU IDs to 8.
 	 *
 	 */
-	if (get_cpu_apic_id(i) > 7)
+	if (i > 7)
 		return false;
 	
Index: kernel/genarch/src/acpi/madt.c
===================================================================
--- kernel/genarch/src/acpi/madt.c	(revision 263bda21cd3cd48db6a7af349e737c62847da815)
+++ kernel/genarch/src/acpi/madt.c	(revision 4edd57fdd301e5105dd61b632079e978c001e6e6)
@@ -95,8 +95,8 @@
 	/*
 	 * FIXME: The current local APIC driver limits usable
-	 * APIC IDs to 8.
+	 * CPU IDs to 8.
 	 *
 	 */
-	if (madt_cpu_apic_id(i) > 7)
+	if (i > 7)
 		return false;