diff --git a/devices/servivi/modules/arion/lineageos/compose.nix b/devices/servivi/modules/arion/lineageos/compose.nix
index 307cc40..79f555e 100644
--- a/devices/servivi/modules/arion/lineageos/compose.nix
+++ b/devices/servivi/modules/arion/lineageos/compose.nix
@@ -2,7 +2,9 @@
   config,
   rwPath,
   ...
-}: {
+}: let
+  secrets = config.sops.secrets;
+in {
   # FIXME: crashes when building
 
   # This should only be ran when an update is needed
@@ -66,7 +68,7 @@
         "${toString ./.}/Caddyfile:/etc/caddy/Caddyfile:ro"
       ];
 
-      env_file = [config.sops.secrets.caddy-cloudflare.path];
+      env_file = [secrets.caddy-cloudflare.path];
       environment = {
         CLOUDFLARE_EMAIL = "matt@nelim.rg";
         ACME_AGREE = "true";
diff --git a/devices/servivi/modules/borgbackup.nix b/devices/servivi/modules/borgbackup.nix
index 9eba1d7..7dd58ad 100644
--- a/devices/servivi/modules/borgbackup.nix
+++ b/devices/servivi/modules/borgbackup.nix
@@ -10,7 +10,6 @@ with lib; let
 in {
   # Make this file declare default settings
   options.services.borgbackup = {
-    #
     defaults = mkOption {
       type = types.attrs;
     };
@@ -36,11 +35,11 @@ in {
 
     services.borgbackup = {
       defaults = {
-        user = "borg";
-        environment = {BORG_RSH = "ssh -i ${secrets.borg-ssh.path}";};
+        user = mkDefault "borg";
+        environment = mkDefault {BORG_RSH = "ssh -i ${secrets.borg-ssh.path}";};
 
-        repo = "ssh://matt@pve/data/backups/borg";
-        encryption = {
+        repo = mkDefault "ssh://matt@pve/data/backups/borg";
+        encryption = mkDefault {
           mode = "repokey";
           passCommand = let
             cat = "${pkgs.coreutils}/bin/cat";
@@ -49,11 +48,11 @@ in {
         };
 
         # Run every 3 hours
-        startAt = "00/3:00";
-        compression = "auto,lzma";
+        startAt = mkDefault "00/3:00";
+        compression = mkDefault "auto,lzma";
       };
 
-      jobs = mapAttrs (_: v: v // cfg.defaults) cfg.configs;
+      jobs = mapAttrs (_: v: cfg.defaults // v) cfg.configs;
     };
   };
 }