diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 1be8e3ba7..a3090685d 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -591,13 +591,13 @@ zephyr_library_sources(
 	${SOF_SRC_PATH}/schedule/schedule.c
 
 	${SOF_SRC_PATH}/idc/zephyr_idc.c
-	${SOF_SRC_PATH}/lib-zephyr/cpu.c
 
 	# Bridge wrapper between SOF and Zephyr APIs - Will shrink over time.
 	wrapper.c
 	edf_schedule.c
 	schedule.c
 	lib/alloc.c
+	lib/cpu.c
 
 	# Common library functions - Will be moved to Zephyr over time
 	lib.c
diff --git a/src/lib-zephyr/cpu.c b/zephyr/lib/cpu.c
similarity index 100%
rename from src/lib-zephyr/cpu.c
rename to zephyr/lib/cpu.c