diff --git a/hmModules/swayidle/default.nix b/hmModules/swayidle/default.nix
index 62f7157..a2b7ba0 100644
--- a/hmModules/swayidle/default.nix
+++ b/hmModules/swayidle/default.nix
@@ -6,17 +6,17 @@
   services.swayidle = let
     # Downgraded due to
     # https://github.com/mortie/swaylock-effects/issues/95
-    swaylock-effects = pkgs.swaylock-effects.overrideAttrs (_: {
-      version = "jirutka-master";
-      src = pkgs.fetchFromGitHub {
-        owner = "jirutka";
-        repo = "swaylock-effects";
-        rev = "7c5681ce96587ce3090c6698501faeccdfdc157d";
-        sha256 = "sha256-09Kq90wIIF9lPjiY2anf9MSgi/EqeXKXW1mFmhxA/aM";
-      };
-    });
+    # swaylock-effects = pkgs.swaylock-effects.overrideAttrs (_: {
+    #   version = "jirutka-master";
+    #   src = pkgs.fetchFromGitHub {
+    #     owner = "jirutka";
+    #     repo = "swaylock-effects";
+    #     rev = "7c5681ce96587ce3090c6698501faeccdfdc157d";
+    #     sha256 = "sha256-09Kq90wIIF9lPjiY2anf9MSgi/EqeXKXW1mFmhxA/aM";
+    #   };
+    # });
     swaylockWithArgs = pkgs.writeScriptBin "swaylockWithArgs" ''
-      ${swaylock-effects}/bin/swaylock \
+      ${pkgs.swaylock-effects}/bin/swaylock \
         --daemonize \
         --screenshots \
         --clock \
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 6df5c25..0f2b41c 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -26,6 +26,7 @@
       "ssh-initrd"
       "hercules-ci"
       "printing"
+      "pam"
     ]
     ++ [
       ./disko.nix
diff --git a/modules/fprintd/default.nix b/modules/fprintd/default.nix
index 0f9822b..85508db 100644
--- a/modules/fprintd/default.nix
+++ b/modules/fprintd/default.nix
@@ -1,13 +1,15 @@
 {
+  imports = [../pam];
+
   services.fprintd = {
     enable = false; # temporarily disable
   };
 
   security.polkit.enable = true; # TODO needed?
 
-  security.pam.services.swaylock.text = ''
-    auth            include         login
-    auth            sufficient      pam_unix.so try_first_pass likeauth nullok
-  '';
+  # security.pam.services.swaylock.text = ''
+  #   auth            include         login
+  #   auth            sufficient      pam_unix.so try_first_pass likeauth nullok
+  # '';
   #     # auth            sufficient      pam_fprintd.so
 }
diff --git a/modules/pam/default.nix b/modules/pam/default.nix
new file mode 100644
index 0000000..0a279ea
--- /dev/null
+++ b/modules/pam/default.nix
@@ -0,0 +1,6 @@
+{
+  security.pam.services.swaylock.text = ''
+    auth            include         login
+    auth            sufficient      pam_unix.so try_first_pass likeauth nullok
+  '';
+}