diff --git a/system/init/main.zig b/system/init/main.zig
index caf7e8b..1b519e0 100644
--- a/system/init/main.zig
+++ b/system/init/main.zig
@@ -1,6 +1,6 @@
 const system = @import("system");
-const vm = @import("arch/vm.zig");
 
+const vm = system.vm;
 const syscalls = system.syscalls;
 const buffer = system.ring_buffer;
 
diff --git a/system/init/arch/vm.zig b/system/lib/arch/vm.zig
similarity index 100%
rename from system/init/arch/vm.zig
rename to system/lib/arch/vm.zig
diff --git a/system/init/arch/x86_64/vm.zig b/system/lib/arch/x86_64/vm.zig
similarity index 98%
rename from system/init/arch/x86_64/vm.zig
rename to system/lib/arch/x86_64/vm.zig
index 8db0547..c1da581 100644
--- a/system/init/arch/x86_64/vm.zig
+++ b/system/lib/arch/x86_64/vm.zig
@@ -1,7 +1,5 @@
 const std = @import("std");
-const system = @import("system");
-
-const syscalls = system.syscalls;
+const syscalls = @import("../../syscalls.zig");
 
 const MapError = error{
     MemoryAlreadyInUse,
diff --git a/system/lib/system.zig b/system/lib/system.zig
index 2bc0c1e..e10dbfb 100644
--- a/system/lib/system.zig
+++ b/system/lib/system.zig
@@ -1,3 +1,4 @@
 pub const kernel = @import("kernel.zig");
 pub const ring_buffer = @import("ring_buffer.zig");
 pub const syscalls = @import("syscalls.zig");
+pub const vm = @import("arch/vm.zig");