diff --git a/modules/system/devices/disks/filesystems/default.nix b/modules/system/devices/disks/filesystems/default.nix
index 7d8ce695..57176609 100644
--- a/modules/system/devices/disks/filesystems/default.nix
+++ b/modules/system/devices/disks/filesystems/default.nix
@@ -1,9 +1,8 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   boot.supportedFilesystems = {
-    btrfs = true;
-    ntfs = lib.mkIf config.system.desktop.enable true;
-    zfs = lib.mkIf config.system.server.enable true;
+    ntfs = config.system.desktop.enable;
+    zfs = config.system.server.enable;
   };
 
   services = {
diff --git a/modules/system/services/general/ssh/default.nix b/modules/system/services/general/ssh/default.nix
index b7fa7ca8..7169d070 100644
--- a/modules/system/services/general/ssh/default.nix
+++ b/modules/system/services/general/ssh/default.nix
@@ -5,10 +5,10 @@
   services.openssh = {
     enable = true;
     settings = {
-      PermitRootLogin = lib.mkForce "no";
-      PrintLastLog = "no";
-      PasswordAuthentication = false;
+      AllowGroups = [ "users" ];
+      AuthenticationMethods = "publickey";
       PermitEmptyPasswords = true;
+      PrintLastLog = "no";
     };
   };