diff --git a/flake.nix b/flake.nix
index f5def89..6f467a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,6 +58,7 @@
         na-desktop = mkSystem "na-desktop" [
           nixos-hardware.nixosModules.common-pc-ssd
           nixos-hardware.nixosModules.common-cpu-amd
+          nixos-hardware.nixosModules.common-gpu-amd
         ];
 
         gl-desktop = mkSystem "gl-desktop" [ nixos-hardware.nixosModules.framework-11th-gen-intel ];
diff --git a/system/na-desktop.nix b/system/na-desktop.nix
index 6f4a727..86917d1 100644
--- a/system/na-desktop.nix
+++ b/system/na-desktop.nix
@@ -8,21 +8,23 @@
   boot = {
     kernelModules = [ "kvm-amd" ];
     initrd.availableKernelModules = [
-      "xhci_pci"
+      "nvme"
       "ahci"
-      "usbhid"
       "sd_mod"
+      "usb_storage"
+      "usbhid"
+      "xhci_pci"
     ];
 
     initrd.luks.devices."cryptroot" = {
-      device = "/dev/disk/by-uuid/d7cb1528-0617-4448-80c9-99fbc3533a55";
+      device = "/dev/disk/by-uuid/97fd46bb-2895-4ec5-9263-eea4ce41cc5b";
       allowDiscards = true;
     };
   };
 
   fileSystems = {
     "/boot" = {
-      device = "/dev/disk/by-uuid/F52A-ACBF";
+      device = "/dev/disk/by-uuid/C5C2-E19C";
       fsType = "vfat";
       options = [
         "fmask=0077"
@@ -73,5 +75,16 @@
         "discard=async"
       ];
     };
+
+    "/data" = {
+      device = "/dev/disk/by-uuid/efd07b1b-825c-41d0-8a4d-f3cf96fb10ac";
+      fsType = "btrfs";
+      options = [
+        "subvol=@data"
+        "noatime"
+        "compress=zstd:3"
+        "autodefrag"
+      ];
+    };
   };
 }