diff --git a/default.nix b/default.nix
index 4e06d32..4b23405 100644
--- a/default.nix
+++ b/default.nix
@@ -25,7 +25,7 @@ let
                 package = pkgs.legacyPackages.${system}.nixUnstable;
                 nixPath= [ "nixpkgs=${pkgs}" ];
                 registry.nixpkgs.flake = pkgs;
-                registry.nixpkgs-unstable.flake = pkgs.unstable;
+                registry.nixpkgs-unstable.flake = flakes.nixpkgs-unstable;
               }
               ;}
           ] ++ extraModules
diff --git a/users/ellmau/git.nix b/users/ellmau/git.nix
index 6aeb619..ae2a851 100644
--- a/users/ellmau/git.nix
+++ b/users/ellmau/git.nix
@@ -11,7 +11,7 @@
           core = { editor = "emacsclient"; };
           gpg = lib.mkIf config.variables.git.gpgsm {
             format = "x509";
-            program = "${pkgs.gpgsm}/bin/gpgsm";
+            program = "${pkgs.gnupg}/bin/gpgsm";
           };
           #gpg = {
           #  format = "x509";