diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix
index 0b5e798..9384708 100755
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -81,6 +81,7 @@ lib.mkIf config.sovran_systemsOS.services.nextcloud {
       DB_HOST="localhost"
       ADMIN_USER=$(pwgen -s 16 1)
       ADMIN_PASS=$(pwgen -s 24 1)
+      SERVER_ID=$(head -c 16 /dev/urandom | od -An -tx1 | tr -d ' \n')
 
       echo "══════════════════════════════════════════════"
       echo "  Nextcloud Automated Installation"
@@ -146,7 +147,7 @@ lib.mkIf config.sovran_systemsOS.services.nextcloud {
         php $INSTALL_DIR/occ config:system:set maintenance_window_start --type=integer --value=1
         php $INSTALL_DIR/occ config:system:set memcache.local --value='\OC\Memcache\APCu'
         php $INSTALL_DIR/occ config:system:set memcache.locking --value='\OC\Memcache\APCu'
-        php $INSTALL_DIR/occ config:system:set server_id --value=\"\$(head -c 16 /dev/urandom | od -An -tx1 | tr -d ' \n')\"
+        php $INSTALL_DIR/occ config:system:set server_id --value='$SERVER_ID'
         php $INSTALL_DIR/occ background:cron
       "
 
@@ -157,7 +158,9 @@ lib.mkIf config.sovran_systemsOS.services.nextcloud {
         php $INSTALL_DIR/occ db:add-missing-columns
         php $INSTALL_DIR/occ db:add-missing-primary-keys
         php $INSTALL_DIR/occ maintenance:repair --include-expensive
-        php $INSTALL_DIR/occ app:info app_api >/dev/null 2>&1 && php $INSTALL_DIR/occ app:disable app_api || true
+        if php $INSTALL_DIR/occ app:info app_api >/dev/null 2>&1; then
+          php $INSTALL_DIR/occ app:disable app_api
+        fi
       "
 
       /run/wrappers/bin/su -s /bin/sh caddy -c "