diff --git a/system/default.nix b/system/default.nix
index f4c36e5..9657b3b 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -9,13 +9,6 @@
     ./virtualisation.nix
   ];
 
-  boot = {
-    initrd.systemd.enable = true;
-    kernel.sysctl = {
-      "vm.swappiness" = 0;
-    };
-  };
-
   console.useXkbConfig = true;
 
   environment.sessionVariables = {
diff --git a/system/hardware/kernel.nix b/system/hardware/kernel.nix
index ab0e1f8..fa769e2 100644
--- a/system/hardware/kernel.nix
+++ b/system/hardware/kernel.nix
@@ -12,10 +12,14 @@
         "rtsx_pci_sdmmc"
       ];
       kernelModules = [ "i915" ];
+      systemd.enable = true;
     };
     kernelModules = [ "kvm-intel" ];
     kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
     kernelParams = [ "quiet" ];
+    kernel.sysctl = {
+      "vm.swappiness" = 0;
+    };
   };
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";