diff --git a/nixos/henna/configuration.nix b/nixos/henna/configuration.nix
index 8cb1547..90f463e 100644
--- a/nixos/henna/configuration.nix
+++ b/nixos/henna/configuration.nix
@@ -6,53 +6,36 @@
   hardware.opengl.enable = true;
   hardware.opengl.driSupport = true;
   hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages = with pkgs; [
-    mesa.drivers
-    rocm-opencl-icd
-    rocm-opencl-runtime
-  ];
 
   boot = {
     loader = {
       grub = {
         enable = true;
+        version = 2;
         device = "/dev/sda";
         memtest86.enable = true;
-        enableCryptodisk = true;
       };
     };
-    kernelParams = [
-      "radeon.si_support=0"
-      "radeon.cik_support=0"
-      "amdgpu.si_support=1"
-      "amdgpu.cik_support=1"
-    ];
+    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+    supportedFilesystems = [ "zfs" ];
+    zfs.requestEncryptionCredentials = true;
     extraModulePackages = with config.boot.kernelPackages; [
         v4l2loopback.out
     ];
     kernelModules = [
       "v4l2loopback"
     ];
-    initrd.kernelModules = [
-      "nouveau"
-    ];
-
-    initrd.luks.devices."luks-2bd7a13f-62b5-4c44-822b-e836ebb84c01".keyFile = "/crypto_keyfile.bin";
-    # Enable swap on luks
-    initrd.luks.devices."luks-aa357d98-202a-46e5-9171-fbe19261cec6".device = "/dev/disk/by-uuid/aa357d98-202a-46e5-9171-fbe19261cec6";
-    initrd.luks.devices."luks-aa357d98-202a-46e5-9171-fbe19261cec6".keyFile = "/crypto_keyfile.bin";
-
-    initrd.secrets = {
-      "/crypto_keyfile.bin" = null;
-    };
     extraModprobeConfig = ''
-    options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
-  '';
+      options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
+    '';
+    kernelParams = [ "zfs.zfs_arc_max=268435456" ];
   };
 
-  networking.hostName = "henna";
   networking.networkmanager.enable = true;
+  networking.hostName = "henna";
+  networking.hostId = "92f409ff";
   time.timeZone = "Europe/Helsinki";
+
   i18n.defaultLocale = "fi_FI.UTF-8";
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "fi_FI.UTF-8";
diff --git a/nixos/henna/hardware-configuration.nix b/nixos/henna/hardware-configuration.nix
index c6aceba..8518988 100644
--- a/nixos/henna/hardware-configuration.nix
+++ b/nixos/henna/hardware-configuration.nix
@@ -8,20 +8,24 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/884ee2db-1e35-4d38-86d7-6d7937129df6";
-      fsType = "ext4";
+    { device = "juures";
+      fsType = "zfs";
     };
 
-  boot.initrd.luks.devices."luks-2bd7a13f-62b5-4c44-822b-e836ebb84c01".device = "/dev/disk/by-uuid/2bd7a13f-62b5-4c44-822b-e836ebb84c01";
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5823-85C0";
+      fsType = "vfat";
+    };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/36ae9159-8d42-4cf9-a7a4-37330a96b188"; }
+    [ { device = "/dev/disk/by-uuid/56644356-389c-4b99-9a49-6fddb7dec763"; }
+      { device = "/dev/disk/by-uuid/6dc6f2c6-4850-4f91-befc-4eaf68e7fd07"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking