diff --git a/overlays/default.nix b/overlays/default.nix
index 8c92b8db..a7278ba8 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 let
   files = [
+    "firefox.nix"
     "pass.nix"
     "ssh.nix"
     "zeroad.nix"
diff --git a/overlays/firefox.nix b/overlays/firefox.nix
new file mode 100644
index 00000000..7c5f5ae3
--- /dev/null
+++ b/overlays/firefox.nix
@@ -0,0 +1,3 @@
+self: super: {
+  firefox = super.firefox.override { extraNativeMessagingHosts = [ self.passff-host ]; pkcs11Modules = [ self.eid-mw ]; };
+}
diff --git a/overlays/pass.nix b/overlays/pass.nix
index 359ea925..6644b3d9 100644
--- a/overlays/pass.nix
+++ b/overlays/pass.nix
@@ -1,4 +1,3 @@
 self: super: {
-  firefox = super.firefox.override { extraNativeMessagingHosts = [ self.passff-host ]; };
   pass = (super.pass-wayland.override { pass = super.pass-wayland; }).withExtensions (ext: [ ext.pass-otp ]);
 }