diff --git a/configuration.nix b/configuration.nix
index 3aa4f32..ed20497 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,8 +10,10 @@
     extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
     blacklistedKernelModules = [ "btusb" ];
     supportedFilesystems = [ "zfs" ];
-    zfs.requestEncryptionCredentials = true;
-    zfs.enableUnstable = true;
+    zfs = {
+      requestEncryptionCredentials = true;
+      enableUnstable = true;
+    };
   };
 
   # Intel CPU tweaks
diff --git a/modules/periodic.nix b/modules/periodic.nix
index 3a04c64..b891ef2 100644
--- a/modules/periodic.nix
+++ b/modules/periodic.nix
@@ -4,7 +4,7 @@ with pkgs;
 
 let
   emacs-vterm = ((emacsPackagesNgGen emacsPgtkGcc).emacsWithPackages
-    (epkgs: with epkgs; [ vterm ]));
+    (epkgs: [ epkgs.vterm ]));
 
 in {
   # Upgrade Doom Emacs daily
@@ -32,7 +32,7 @@ in {
   # Upgrade Neovim plugins weekly
   systemd.user.services.vim-plug-upgrade = {
     description = "Upgrade Vim-Plug";
-    path = [ pkgs.git pkgs.neovim ];
+    path = [ git neovim ];
     script = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
     serviceConfig.Type = "oneshot";
     startAt = "Wed 18:00:00";
@@ -41,7 +41,7 @@ in {
   # Push password-store changes to git daily
   systemd.user.services.password-store-push = {
     description = "Push password-store changes to git";
-    path = [ pkgs.pass-wayland pkgs.git pkgs.gitAndTools.pass-git-helper ];
+    path = [ pass-wayland git gitAndTools.pass-git-helper ];
     script = "${pkgs.pass-wayland}/bin/pass git push";
     serviceConfig.Type = "oneshot";
     startAt = "18:00:00";