diff --git a/guix-data-service/model/build.scm b/guix-data-service/model/build.scm
index 86eac9d..3822459 100644
--- a/guix-data-service/model/build.scm
+++ b/guix-data-service/model/build.scm
@@ -283,13 +283,14 @@ FROM builds
 INNER JOIN build_servers ON build_servers.id = builds.build_server_id
 INNER JOIN latest_build_status
   ON latest_build_status.build_id = builds.id
-INNER JOIN derivation_output_details_sets
-  ON builds.derivation_output_details_set_id =
-     derivation_output_details_sets.id
-INNER JOIN derivation_output_details
-  ON ARRAY[derivation_output_details.id] <@
-     derivation_output_details_sets.derivation_output_details_ids
-WHERE derivation_output_details.path = $1
+WHERE builds.derivation_output_details_set_id = (
+  SELECT derivation_output_details_sets.id
+  FROM derivation_output_details_sets
+  INNER JOIN derivation_output_details
+    ON ARRAY[derivation_output_details.id] <@
+       derivation_output_details_sets.derivation_output_details_ids
+  WHERE derivation_output_details.path = $1
+)
 ORDER BY latest_build_status.timestamp DESC")
 
   (exec-query-with-null-handling conn query (list output)))