diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6b109b..1190063 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ set(CMAKE_TOOLCHAIN_FILE "sdk/cmake/toolchain.cmake")
 project(EXECTOS)
 
 # Load all the CMake SDK
-include(sdk/cmake/baseaddress.cmake)
+include(sdk/cmake/baseaddress/${ARCH}.cmake)
 include(sdk/cmake/emulation.cmake)
 include(sdk/cmake/functions.cmake)
 include(sdk/cmake/version.cmake)
diff --git a/sdk/cmake/baseaddress/amd64.cmake b/sdk/cmake/baseaddress/amd64.cmake
new file mode 100644
index 0000000..162a92e
--- /dev/null
+++ b/sdk/cmake/baseaddress/amd64.cmake
@@ -0,0 +1,2 @@
+# Set base addresses for all modules
+set(BASEADDRESS_XTOSKRNL 0x0000000140000000)
diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress/i686.cmake
similarity index 66%
rename from sdk/cmake/baseaddress.cmake
rename to sdk/cmake/baseaddress/i686.cmake
index 0dee7c4..265fa5e 100644
--- a/sdk/cmake/baseaddress.cmake
+++ b/sdk/cmake/baseaddress/i686.cmake
@@ -1,3 +1,2 @@
 # Set base addresses for all modules
-set(BASEADDRESS_XTLDR    0x00010000)
 set(BASEADDRESS_XTOSKRNL 0x00400000)
diff --git a/xtldr/CMakeLists.txt b/xtldr/CMakeLists.txt
index d6437e0..e356c8f 100644
--- a/xtldr/CMakeLists.txt
+++ b/xtldr/CMakeLists.txt
@@ -49,6 +49,5 @@ set_install_target(xtldr efi/boot)
 
 # Set loader entrypoint and subsystem
 set_entrypoint(xtldr "BlStartXtLoader")
-set_imagebase(xtldr ${BASEADDRESS_XTLDR})
 set_linker_map(xtldr TRUE)
 set_subsystem(xtldr efi_application)