diff --git a/modules/nixos/base/boot.nix b/modules/nixos/base/boot.nix
new file mode 100644
index 0000000..4916884
--- /dev/null
+++ b/modules/nixos/base/boot.nix
@@ -0,0 +1,17 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  boot = {
+    kernelPackages =
+      lib.mkIf (!config.marleyos.profiles.server.enable)
+      pkgs.linuxPackages_xanmod;
+
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
+}
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
new file mode 100644
index 0000000..daff6ff
--- /dev/null
+++ b/modules/nixos/base/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./boot.nix
+  ];
+}
diff --git a/snowflake/modules/nixos/base/boot/default.nix b/snowflake/modules/nixos/base/boot/default.nix
deleted file mode 100644
index 3d0d8fe..0000000
--- a/snowflake/modules/nixos/base/boot/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  boot.kernelPackages = lib.mkIf (!config.marleyos.isServer) pkgs.linuxPackages_xanmod;
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-}