diff --git a/hosts/swan/default.nix b/hosts/swan/default.nix
index c207deb..4a983c9 100644
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@@ -20,6 +20,10 @@ nixpkgs.lib.nixosSystem {
     {
       server = true;
       zfs.enable = true;
+
+      # head -c 8 /etc/machine-id
+      networking.hostId = "600279f4"; # Random ID required for ZFS
+
       gui.enable = false;
       theme = { colors = (import ../../colorscheme/gruvbox).dark; };
       nixpkgs.overlays = overlays;
diff --git a/modules/nixos/hardware/zfs.nix b/modules/nixos/hardware/zfs.nix
index 07b82ea..dea9c42 100644
--- a/modules/nixos/hardware/zfs.nix
+++ b/modules/nixos/hardware/zfs.nix
@@ -8,6 +8,8 @@
       # Only use compatible Linux kernel, since ZFS can be behind
       boot.kernelPackages =
         config.boot.zfs.package.latestCompatibleLinuxPackages;
+      boot.kernelParams = [ "nohibernate" ];
+      boot.supportedFilesystems = [ "zfs" ];
 
     };