diff --git a/.quixos-subtree-source.json b/.quixos-subtree-source.json
index babc4be..02b5cfe 100644
--- a/.quixos-subtree-source.json
+++ b/.quixos-subtree-source.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git",
-  "sourceCommit": "398fd9e0d723c3fe7a511c2c35702874fd7342d0",
+  "sourceCommit": "8354a2e04f56eea0a647e878ca19c5398c1e1f89",
   "sourcePath": "quixos-instance/quixos-nix-helpers",
   "exportName": "quixos-nix-helpers",
   "mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
diff --git a/quixos-package-helpers.nix b/quixos-package-helpers.nix
index e81887e..23f52da 100644
--- a/quixos-package-helpers.nix
+++ b/quixos-package-helpers.nix
@@ -574,6 +574,14 @@ EOF
         bundleTarget = bundleConfig.target or "node24";
         bundleFormat = bundleConfig.format or "esm";
         bundleBanner = bundleConfig.banner or nodeRequireBanner;
+        bundleAliases = bundleConfig.aliases or {
+          "@automerge/automerge" = "./node_modules/@automerge/automerge/dist/mjs/entrypoints/fullfat_base64.js";
+        };
+        bundleAliasArgs = lib.concatStringsSep " " (
+          lib.mapAttrsToList
+            (from: to: "--alias:${from}=${lib.escapeShellArg to}")
+            bundleAliases
+        );
         nodeRequireBanner = "import { createRequire } from 'module';const require = createRequire(import.meta.url);";
         bundleCommand =
           if bundle == null
@@ -584,6 +592,7 @@ EOF
               --platform=${bundlePlatform} \
               --target=${bundleTarget} \
               --format=${bundleFormat} \
+              ${bundleAliasArgs} \
               ${lib.optionalString (bundleConfig.preserveSymlinks or true) "--preserve-symlinks \\"}
               --banner:js=${lib.escapeShellArg bundleBanner} \
               --outfile=${lib.escapeShellArg bundleOutfile}