diff --git a/system/default.nix b/system/default.nix
index 74e69964..f15a9d37 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -143,7 +143,7 @@ with mylib.networking; {
 
   # Bootloader/Kernel stuff
   boot = {
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages;
     kernelParams = ["mitigations=off"]; # I don't care
 
     # Make /tmp volatile
diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix
index 27b4ce17..f25e4b3a 100644
--- a/system/nixinator/default.nix
+++ b/system/nixinator/default.nix
@@ -104,7 +104,8 @@
   };
 
   boot = {
-    # kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_zen;
+    # kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
 
     # kernelParams = [ "quiet" ];
     # plymouth.enable = true;
diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix
index 8e8ad52e..ba26485e 100644
--- a/system/nixinator/hardware-configuration.nix
+++ b/system/nixinator/hardware-configuration.nix
@@ -35,6 +35,10 @@
       "vfat"
     ];
 
+    supportedFilesystems = [
+      # "zfs" # Probably requires LTS kernel + networking.hostId
+    ];
+
     kernelModules = [
       "kvm-amd"
       "sg" # Blu-Ray drive
@@ -60,6 +64,9 @@
     ];
   };
 
+  # Required for supportedFilesystems = ["zfs"];, so pools don't get imported on the wrong machine
+  # networking.hostId = "611e6afb";
+
   fileSystems = {
     # NOTE: Some filesystems are managed by disko (see ./disks.nix)
 
@@ -82,23 +89,22 @@
     # Using  NFS over TCP or increasing the value of the retrans option may mitigate
     # some of the risks of using the soft option.
 
-    "/home/${username}/Movies" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
-
-    "/home/${username}/Shows" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
-
-    "/home/${username}/Music" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
+    # TODO: New HDDs
+    # "/home/${username}/Movies" = {
+    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
+    #   fsType = "nfs";
+    #   options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    # };
+    # "/home/${username}/Shows" = {
+    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
+    #   fsType = "nfs";
+    #   options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    # };
+    # "/home/${username}/Music" = {
+    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
+    #   fsType = "nfs";
+    #   options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    # };
 
     "/home/${username}/Restic" = {
       device = "192.168.86.15:/volume1/NixinatorPersistence";