diff --git a/modules/latest-zfs-kernel.nix b/modules/latest-zfs-kernel.nix
index 6e369cb..51d21b1 100644
--- a/modules/latest-zfs-kernel.nix
+++ b/modules/latest-zfs-kernel.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  isUnstable = config.boot.zfs.package == pkgs.zfsUnstable;
+  isUnstable = config.boot.zfs.package == pkgs.zfs_unstable;
   zfsCompatibleKernelPackages = lib.filterAttrs (
     name: kernelPackages:
     (builtins.match "linux_[0-9]+_[0-9]+" name) != null
diff --git a/modules/periodic.nix b/modules/periodic.nix
index c178a25..1d92a8c 100644
--- a/modules/periodic.nix
+++ b/modules/periodic.nix
@@ -48,7 +48,7 @@ in
     path = [
       pass-wayland
       git
-      gitAndTools.pass-git-helper
+      pass-git-helper
     ];
     script = "${pkgs.pass-wayland}/bin/pass git push";
     serviceConfig.Type = "oneshot";
@@ -120,7 +120,7 @@ in
     path = [
       pass-wayland
       git
-      gitAndTools.pass-git-helper
+      pass-git-helper
     ];
     script = "${pkgs.git}/bin/git -C /home/coolneng/Projects/panacea push";
     serviceConfig.Type = "oneshot";
diff --git a/modules/software.nix b/modules/software.nix
index dc5129b..4de3d7d 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -36,7 +36,7 @@ in
     gnupg
     pass-wayland
     passff-host
-    gitAndTools.pass-git-helper
+    pass-git-helper
     inputs.agenix.packages.${config.nixpkgs.localSystem.system}.default
     git-crypt
     git-lfs
@@ -63,14 +63,14 @@ in
     direnv
     nix-direnv
     gnumake
-    gitAndTools.pre-commit
+    pre-commit
     # Rice
     adapta-gtk-theme
     paper-icon-theme
     # Audio
     mopidy
     ncmpcpp
-    mpc_cli
+    mpc
     pulsemixer
     easyeffects
     patched-bitwig