diff --git a/system/desktop.nix b/system/desktop.nix
index e569777b..7bc07afe 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -27,6 +27,7 @@
     ./hardware/machines/desktop.nix
     ./hardware/systemdboot.nix
     ./hardware/opengl.nix
+    ./hardware/filesystems.nix
     ./hardware/nvidia.nix
     #./hardware/nouveau.nix
 
diff --git a/system/hardware/filesystems.nix b/system/hardware/filesystems.nix
new file mode 100644
index 00000000..0777d8c8
--- /dev/null
+++ b/system/hardware/filesystems.nix
@@ -0,0 +1,6 @@
+{lib, ...}: {
+  boot.supportedFilesystems = {                             
+    ntfs = true;
+    zfs = lib.mkForce false;
+  };
+}
diff --git a/system/hardware/machines/desktop.nix b/system/hardware/machines/desktop.nix
index a222412a..7fdaf193 100644
--- a/system/hardware/machines/desktop.nix
+++ b/system/hardware/machines/desktop.nix
@@ -49,12 +49,6 @@ in {
 	"kvm-amd"
       ];
     };
-                                                         
-    # Manage supported filesystems                       
-    supportedFilesystems = {                             
-      ntfs = true;
-      zfs = lib.mkForce false;
-    };
   };
 
   # Additional entry to boot from the second GPU
diff --git a/system/hardware/machines/lenovo.nix b/system/hardware/machines/lenovo.nix
index 0da98328..be3a8b47 100644
--- a/system/hardware/machines/lenovo.nix
+++ b/system/hardware/machines/lenovo.nix
@@ -24,12 +24,6 @@
 	"kvm-amd"
       ];
     };
-                                                         
-    # Manage supported filesystems                       
-    supportedFilesystems = {                             
-      ntfs = true;
-      zfs = lib.mkForce false;
-    };
   };
 
   # Mount everything as necessary
diff --git a/system/pinebook.nix b/system/pinebook.nix
index e2344b11..40efa762 100644
--- a/system/pinebook.nix
+++ b/system/pinebook.nix
@@ -30,6 +30,7 @@
     ./hardware/machines/pinebook.nix
     ./hardware/extlinux.nix
     ./hardware/opengl.nix
+    ./hardware/filesystems.nix
 
     # Services
     ./services/openssh.nix