diff --git a/systems/x86_64-linux/jallen-nas/boot.nix b/systems/x86_64-linux/jallen-nas/boot.nix
index 3e3447e..197bffe 100755
--- a/systems/x86_64-linux/jallen-nas/boot.nix
+++ b/systems/x86_64-linux/jallen-nas/boot.nix
@@ -3,28 +3,21 @@
   ...
 }:
 let
-  kernel = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-zen4;
-  # kernel = pkgs.linuxPackages_latest;
+  kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-zen4;
 in
 {
-  # Configure bootloader with lanzaboot and secureboot
   boot = {
-    # Override kernel to latest
-    kernelPackages = kernel;
+    inherit kernelPackages;
 
     kernelParams = [ "amd_iommu=pgtbl_v2" ];
 
     initrd = {
-      supportedFilesystems = [ "bcachefs" ];
-      # clevis = {
-      #   enable = false;
-      #   devices = {
-      #     "/dev/disk/by-label/nas_pool".secretFile = "/etc/clevis/nas_pool.jwe";
-      #   };
-      # };
+      supportedFilesystems = {
+        bcachefs = true;
+      };
     };
 
     # Enable binfmt emulation for ARM
-    binfmt.emulatedSystems = [ "aarch64-linux" ]; # --argstr system aarch64-linux
+    binfmt.emulatedSystems = [ "aarch64-linux" ];
   };
 }
diff --git a/systems/x86_64-linux/matt-nixos/boot.nix b/systems/x86_64-linux/matt-nixos/boot.nix
index acb5711..1006d23 100755
--- a/systems/x86_64-linux/matt-nixos/boot.nix
+++ b/systems/x86_64-linux/matt-nixos/boot.nix
@@ -57,7 +57,6 @@ in
   nixpkgs.crossSystem.system = "aarch64-linux";
 
   environment = {
-    etc."clevis/disk.jwe".source = ./disk.jwe;
     systemPackages = with pkgsVersion; [
       edk2-uefi-shell
     ];
diff --git a/systems/x86_64-linux/matt-nixos/filesystems.nix b/systems/x86_64-linux/matt-nixos/filesystems.nix
index c315d8a..c7ad7f0 100755
--- a/systems/x86_64-linux/matt-nixos/filesystems.nix
+++ b/systems/x86_64-linux/matt-nixos/filesystems.nix
@@ -18,7 +18,7 @@ in
     clevis = {
       enable = lib.mkForce true;
       devices = {
-        "/dev/disk/by-uuid/2b7e2033-2bcc-4fff-b248-833289f07f3d".secretFile = ../../../secrets/hdd.jwe; # config.sops.secrets."disk-key".path;
+        "/dev/disk/by-uuid/6ec88702-d536-494c-bdfd-3cc5c8cdc505".secretFile = ../../../secrets/hdd.jwe; # config.sops.secrets."disk-key".path;
       };
     };
   };
@@ -33,7 +33,7 @@ in
       ++ defaultLocalOptions;
     };
     "/media/matt/slow" = {
-      device = "/dev/disk/by-uuid/2b7e2033-2bcc-4fff-b248-833289f07f3d";
+      device = "/dev/disk/by-uuid/6ec88702-d536-494c-bdfd-3cc5c8cdc505";
       fsType = "bcachefs";
       options = [
         "noatime"