diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 429e425..23ddc80 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -13,6 +13,7 @@
       ../../modules/nixos/sound.nix
       ../../modules/nixos/steam.nix
       ../../modules/nixos/env.nix
+      ../../modules/nixos/1password.nix
     ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index bfb7d87..45f02fc 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../modules/home-manager/i3
-    ../../modules/home-manager/1password
+    ../../modules/home-manager/ssh
     ../../modules/home-manager/git
     ../../modules/home-manager/neovim
     ../../modules/home-manager/wezterm
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 82f2eea..bb367a0 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -14,6 +14,7 @@
       ../../modules/nixos/nm.nix
       ../../modules/nixos/sound.nix
       ../../modules/nixos/env.nix
+      ../../modules/nixos/1password.nix
     ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
index 1765dc2..ece8b4c 100644
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../modules/home-manager/i3
-    ../../modules/home-manager/1password
+    ../../modules/home-manager/ssh
     ../../modules/home-manager/git
     ../../modules/home-manager/neovim
     ../../modules/home-manager/wezterm
@@ -28,7 +28,6 @@
 
   home.packages = with pkgs; [
     firefox
-    _1password-gui
     gcc
     fzf
     ripgrep
diff --git a/modules/home-manager/1password/default.nix b/modules/home-manager/ssh/default.nix
similarity index 68%
rename from modules/home-manager/1password/default.nix
rename to modules/home-manager/ssh/default.nix
index ac730e9..6c3b91e 100644
--- a/modules/home-manager/1password/default.nix
+++ b/modules/home-manager/ssh/default.nix
@@ -1,11 +1,6 @@
 { pkgs, config, ... }:
 
 {
-  home.packages = with pkgs; [
-    _1password
-    _1password-gui
-  ];
-  
   programs.ssh = {
     enable = true;
     extraConfig = ''
diff --git a/modules/nixos/1password.nix b/modules/nixos/1password.nix
new file mode 100644
index 0000000..80dfd3d
--- /dev/null
+++ b/modules/nixos/1password.nix
@@ -0,0 +1,9 @@
+{
+  programs = {
+    _1password.enable = true;
+    _1password-gui = {
+      enable = true;
+      polkitPolicyOwners = [ "mthomson" ];
+    };
+  };
+}