diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index 4488aaa..7b477a7 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -7,7 +7,6 @@
     nixos-hardware.nixosModules.common-gpu-amd
     nixos-hardware.nixosModules.common-pc-ssd
 
-    ./hardware-configuration.nix
     ../../users/erwin
     ../../users/root
     ../../users/builder
@@ -65,8 +64,43 @@
     systemd.enable = true;
   };
 
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/42065c7e-d0aa-4de8-a913-014cf59d48ac";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/4064-A1BE";
+    fsType = "vfat";
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/082ec5d2-238e-4713-9c37-31b1cb0fb8c3";
+    fsType = "ext4";
+  };
+
+  swapDevices = [{ device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; }];
+
+  # high-resolution display
+  # hardware.video.hidpi.enable = lib.mkDefault true;
+
+  # Enable firmware
+  hardware.enableAllFirmware = true;
+
+  # i2c support
+  hardware.i2c.enable = true;
+
   boot = {
+    initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+    initrd.kernelModules = [ ];
+
     kernelPackages = pkgs.linuxPackages_6_3;
+    kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" "nf_nat_ftp" ];
+    kernelParams = [ "amd_pstate.shared_mem=1" ];
+    extraModulePackages = [ ] ++
+      (with config.boot.kernelPackages; [ rtl88x2bu zenpower cpupower ]);
+
     loader = {
       systemd-boot = {
         enable = true;
diff --git a/machines/loki/hardware-configuration.nix b/machines/loki/hardware-configuration.nix
deleted file mode 100644
index e68051f..0000000
--- a/machines/loki/hardware-configuration.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, ... }: {
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" "nf_nat_ftp" ];
-  boot.kernelParams = [ "amd_pstate.shared_mem=1" ];
-  boot.extraModulePackages = [ ] ++
-    (with config.boot.kernelPackages; [ rtl88x2bu zenpower cpupower ]);
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/42065c7e-d0aa-4de8-a913-014cf59d48ac";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/4064-A1BE";
-    fsType = "vfat";
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/082ec5d2-238e-4713-9c37-31b1cb0fb8c3";
-    fsType = "ext4";
-  };
-
-  swapDevices = [{ device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; }];
-
-  # high-resolution display
-  # hardware.video.hidpi.enable = lib.mkDefault true;
-
-  # Enable firmware
-  hardware.enableAllFirmware = true;
-
-  # i2c support
-  hardware.i2c.enable = true;
-}