diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d111e146..63137aae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
             trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=
             experimental-features = nix-command flakes ca-derivations
             post-build-hook = ${{ github.workspace }}/scripts/post-build-hook
-            substituters = https://cache.chir.rs/
+            substituters = https://cache.chir.rs/ https://cache.nixos.org/
       - name: Download patched nix
         run: nix build github:DarkKirb/nix-packages#nix-s3-dedup
       - name: Set up secrets
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index e9cf83ea..6db492cf 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -16,7 +16,7 @@ jobs:
             trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=
             experimental-features = nix-command flakes ca-derivations
             post-build-hook = ${{ github.workspace }}/scripts/post-build-hook
-            substituters = https://cache.chir.rs/
+            substituters = https://cache.chir.rs/ https://cache.nixos.org/
       - name: Download patched nix
         run: nix build github:DarkKirb/nix-packages#nix-s3-dedup
       - name: Set up secrets
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 99a34f44..d34e594f 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -18,7 +18,7 @@ jobs:
             trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=
             experimental-features = nix-command flakes ca-derivations
             post-build-hook = ${{ github.workspace }}/scripts/post-build-hook
-            substituters = https://cache.chir.rs/
+            substituters = https://cache.chir.rs/ https://cache.nixos.org/
       - name: Set up secrets
         run: |
           echo "$NIX_CACHE_KEY" > ~/cache.key
diff --git a/config/nas.nix b/config/nas.nix
index 1d4f8e98..6ca7ba66 100644
--- a/config/nas.nix
+++ b/config/nas.nix
@@ -247,6 +247,7 @@
   hardware.enableRedistributableFirmware = true;
   nix.settings.substituters = lib.mkForce [
     "https://cache.chir.rs/"
+    "https://cache.nixos.org/"
   ];
   nix.daemonCPUSchedPolicy = "idle";
   nix.daemonIOSchedClass = "idle";
diff --git a/config/services/peertube/default.nix b/config/services/peertube/default.nix
index a525e3c6..9de6b6ae 100644
--- a/config/services/peertube/default.nix
+++ b/config/services/peertube/default.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
+{ config, pkgs, lib, ... }: {
   services.peertube = {
     enable = true;
     localDomain = "peertube.chir.rs";
@@ -30,7 +25,7 @@
     database.createLocally = true;
     redis.createLocally = true;
   };
-  systemd.services.peertube.path = with pkgs; lib.mkForce [bashInteractive ffmpeg_5 nodejs-16_x openssl yarn python3 coreutils systemd];
+  systemd.services.peertube.path = with pkgs; lib.mkForce [ bashInteractive ffmpeg_5 nodejs-16_x openssl yarn python3 coreutils systemd ];
   services.caddy.virtualHosts."peertube.chir.rs" = {
     useACMEHost = "chir.rs";
     extraConfig = ''
diff --git a/zones/chir.rs.nix b/zones/chir.rs.nix
index 20b89e1c..ab97279d 100644
--- a/zones/chir.rs.nix
+++ b/zones/chir.rs.nix
@@ -102,7 +102,7 @@ with dns.lib.combinators; let
     SOA = {
       nameServer = "ns1.chir.rs.";
       adminEmail = "lotte@chir.rs";
-      serial = 18;
+      serial = 17;
     };
     NS = [
       "ns1.chir.rs."
@@ -181,17 +181,13 @@ with dns.lib.combinators; let
       ns2 = createZone {};
       hydra = createZone {};
       mastodon = createZone {};
-      mastodon-assets.CNAME = [
-        "assets-chir-rs.b-cdn.net"
-      ];
+      mastodon-assets = createZone {};
       matrix = createZone {};
       drone = createZone {};
       invtracker = createZone {};
       akko = createZone {};
       moa = createZone {};
-      cache.CNAME = [
-        "cache-chir-rs.b-cdn.net"
-      ];
+      cache = createZone {};
       peertube = createZone {};
 
       int =