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

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);