Further enhancement with #9063a2a - to ensure our message addressing and content picks the right address

app/Jobs/MessageProcess.php

@@ -58,7 +58,7 @@ class MessageProcess implements ShouldQueue
 	public function handle()
 	{
 		// Load our details
-		$ftns = Setup::findOrFail(config('app.id'))->system->addresses;
+		$ftns = our_address();
 
 		// If we are a netmail
 		if ($this->msg->isNetmail()) {

app/Jobs/NodelistImport.php

@@ -74,7 +74,6 @@ class NodelistImport implements ShouldQueue
 	 */
 	public function handle()
 	{
-		$us = Setup::findOrFail(config('app.id'));
 		$our_systems = SystemZone::select('system_id')
 			->get()
 			->pluck('system')
@@ -94,7 +93,7 @@ class NodelistImport implements ShouldQueue
 			->pluck('id')
 			->diff($our_systems);
 
-		$our_addresses = $us->system->addresses->pluck('id');
+		$our_addresses = our_address()->pluck('id');
 
 		// Get the file from the host
 		$file = $this->getFileFromHost(self::importkey,$this->file);

app/Jobs/SystemHeartbeat.php

@@ -26,7 +26,7 @@ class SystemHeartbeat #implements ShouldQueue
 	public function handle(): void
 	{
 		// Our zones
-		$our_zones = Setup::findOrFail(config('app.id'))->system->addresses->pluck('zone_id')->unique();
+		$our_zones = our_address()->pluck('zone_id')->unique();
 
 		// Find our uplinks that are hubs, NC, RC or ZCs
 		// Find any system that also has heartbeat configured