diff --git a/lib/Lacuna/DB/Result/Building/Observatory.pm b/lib/Lacuna/DB/Result/Building/Observatory.pm
index 5ecd124d..f9e413d1 100644
--- a/lib/Lacuna/DB/Result/Building/Observatory.pm
+++ b/lib/Lacuna/DB/Result/Building/Observatory.pm
@@ -17,7 +17,7 @@ around 'build_tags' => sub {
 
 sub probes {
     my $self = shift;
-    return Lacuna->db->resultset('Probes')->search_observatory;
+    return Lacuna->db->resultset('Probes')->search_observatory( { body_id => $self->body->id } );
 }
 
 use constant controller_class => 'Lacuna::RPC::Building::Observatory';
diff --git a/lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm b/lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm
index ff80c9df..e8b2865a 100644
--- a/lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm
+++ b/lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm
@@ -22,7 +22,7 @@ sub image_level {
 
 sub probes {
     my $self = shift;
-    return Lacuna->db->resultset('Probes')->search_oracle;
+    return Lacuna->db->resultset('Probes')->search_oracle( { body_id => $self->body->id } );
 }
 
 after finish_upgrade => sub {
@@ -61,7 +61,7 @@ sub recalc_probes {
     my ($self) = @_;
 
     # It's easier to delete all the virtual probes, then recreate them.
-    $self->probes->delete_all;
+    $self->probes->search->delete_all;
 
     my $range = $self->range / 100;