diff --git a/configuration.nix b/configuration.nix
index 115db74..b133e63 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -171,6 +171,8 @@ with pkgs;
     ./overlays/nix-direnv.nix
     ./overlays/openconnect-sso.nix
     ./overlays/cyrus-sasl-oauth2.nix
+    ./overlays/isync-oauth2.nix
+    ./overlays/emacs-vterm.nix
   ];
 
 }
diff --git a/modules/periodic.nix b/modules/periodic.nix
index 992297a..d3f4998 100644
--- a/modules/periodic.nix
+++ b/modules/periodic.nix
@@ -2,13 +2,7 @@
 
 with pkgs;
 
-let
-  emacs-vterm = ((emacsPackagesFor emacs28NativeComp).emacsWithPackages
-    (epkgs: with epkgs; [ vterm pdf-tools ]));
-  isync-oauth2 = isync.overrideAttrs
-    (div: rec { buildInputs = [ openssl patched-cyrus-sasl-oauth2 zlib ]; });
-
-in {
+{
   # Upgrade Doom Emacs daily
   systemd.user.services.doom-upgrade = {
     description = "Upgrade Doom Emacs";
diff --git a/modules/software.nix b/modules/software.nix
index 00c76a5..ff2ff49 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -3,10 +3,6 @@
 with pkgs;
 
 let
-  emacs-vterm = ((emacsPackagesFor emacs28NativeComp).emacsWithPackages
-    (epkgs: with epkgs; [ vterm pdf-tools ]));
-  isync-oauth2 = isync.overrideAttrs
-    (div: rec { buildInputs = [ openssl db patched-cyrus-sasl-oauth2 zlib ]; });
   mpv-sponsorblock = (pkgs.wrapMpv pkgs.mpv-unwrapped {
     scripts = [ mpvScripts.sponsorblock ];
   });
diff --git a/overlays/emacs-vterm.nix b/overlays/emacs-vterm.nix
new file mode 100644
index 0000000..3e2b876
--- /dev/null
+++ b/overlays/emacs-vterm.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+with pkgs;
+
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      emacs-vterm = ((emacsPackagesFor emacs28NativeComp).emacsWithPackages
+        (epkgs: with epkgs; [ vterm pdf-tools ]));
+    })
+  ];
+}
diff --git a/overlays/isync-oauth2.nix b/overlays/isync-oauth2.nix
new file mode 100644
index 0000000..eb3446a
--- /dev/null
+++ b/overlays/isync-oauth2.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+with pkgs;
+
+{
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      isync-oauth2 = isync.overrideAttrs (div: rec {
+        buildInputs = [ openssl db patched-cyrus-sasl-oauth2 zlib ];
+      });
+    })
+  ];
+}