diff --git a/kernel/Makefile b/kernel/Makefile
index 449c88edf7..3a224328ba 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -32,6 +32,7 @@ BUILDDIR=$(abspath build)
 KERNEL_OBJS=				\
 $(KERNEL_ARCH_OBJS)			\
 kernel/build_libc.o			\
+kernel/CPUID.o				\
 kernel/font.o				\
 kernel/Input.o				\
 kernel/kernel.o				\
diff --git a/kernel/arch/i386/make.config b/kernel/arch/i386/make.config
index 04d6851beb..7e789dc9b2 100644
--- a/kernel/arch/i386/make.config
+++ b/kernel/arch/i386/make.config
@@ -6,7 +6,6 @@ KERNEL_ARCH_LIBS=
 KERNEL_ARCH_OBJS=		\
 $(ARCHDIR)/APIC.o		\
 $(ARCHDIR)/boot.o		\
-$(ARCHDIR)/CPUID.o		\
 $(ARCHDIR)/IDT.o		\
 $(ARCHDIR)/MMU.o		\
  
\ No newline at end of file
diff --git a/kernel/arch/i386/CPUID.cpp b/kernel/kernel/CPUID.cpp
similarity index 100%
rename from kernel/arch/i386/CPUID.cpp
rename to kernel/kernel/CPUID.cpp