diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix
index bc74dbc4..b679a436 100644
--- a/nixos/boxes/foureighty/default.nix
+++ b/nixos/boxes/foureighty/default.nix
@@ -3,7 +3,6 @@
 
   imports = [
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
-    ./custom-kernel.nix
     ./hardware-configuration.nix
     ./tailscale-foureighty.nix
     ./thermal.nix
diff --git a/nixos/boxes/foureighty/hardware-configuration.nix b/nixos/boxes/foureighty/hardware-configuration.nix
index 1a372641..04d5bf41 100644
--- a/nixos/boxes/foureighty/hardware-configuration.nix
+++ b/nixos/boxes/foureighty/hardware-configuration.nix
@@ -8,25 +8,28 @@
         [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
     };
 
-    loader.efi.canTouchEfiVariables = true;
     loader.systemd-boot.enable = true;
+    loader.efi.canTouchEfiVariables = true;
+    loader.efi.efiSysMountPoint = "/boot/efi";
   };
 
-  boot.initrd.luks.devices."crypt".device =
-    "/dev/disk/by-uuid/c2deaeaa-cb76-4d29-a603-0cf42f6e829f";
+  boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
+  boot.initrd.luks.devices."luks-43a80125-4089-45be-9561-fab93f984916".device =
+    "/dev/disk/by-uuid/43a80125-4089-45be-9561-fab93f984916";
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/FC06-82E6";
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/D6C0-1A9D";
     fsType = "vfat";
   };
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/cb12122c-f0ef-4c43-bac1-6b8410a51a54";
+    device = "/dev/disk/by-uuid/98f3597c-183a-45fb-b2a4-b598c18d089a";
     fsType = "btrfs";
+    options = [ "subvol=@" ];
   };
 
   swapDevices = [ ];
 
   nix.maxJobs = 2;
-  nix.buildCores = 6;
+  nix.buildCores = 7;
 }