@@ -5,7 +5,7 @@ CREATE TABLE find_type_index (
   type_reference_builtin INTEGER NULL CONSTRAINT find_type_index_fk1 REFERENCES text(id),
   type_reference_hash_id INTEGER NULL CONSTRAINT find_type_index_fk2 REFERENCES hash(id),
   type_reference_component_index INTEGER NULL,
-  term_referent_object_id INTEGER NOT NULL CONSTRAINT find_type_index_fk3 REFERENCES hash(id),
+  term_referent_object_id INTEGER NOT NULL CONSTRAINT find_type_index_fk3 REFERENCES object(id),
   term_referent_component_index INTEGER NOT NULL,
   term_referent_constructor_index INTEGER NULL,
   CONSTRAINT find_type_index_c1 UNIQUE (
@@ -32,7 +32,7 @@ CREATE TABLE find_type_mentions_index (
   type_reference_builtin INTEGER NULL CONSTRAINT find_type_mentions_index_fk1 REFERENCES text(id),
   type_reference_hash_id INTEGER NULL CONSTRAINT find_type_mentions_index_fk2 REFERENCES hash(id),
   type_reference_component_index INTEGER NULL,
-  term_referent_object_id INTEGER NOT NULL CONSTRAINT find_type_mentions_index_fk3 REFERENCES hash(id),
+  term_referent_object_id INTEGER NOT NULL CONSTRAINT find_type_mentions_index_fk3 REFERENCES object(id),
   term_referent_component_index INTEGER NOT NULL,
   term_referent_constructor_index INTEGER NULL,
   CONSTRAINT find_type_mentions_index_c1 CHECK (
@@ -52,9 +52,9 @@ CREATE INDEX find_type_mentions_index_type ON find_type_mentions_index (
 
 CREATE TABLE dependents_index (
   dependency_builtin INTEGER NULL CONSTRAINT dependents_index_fk1 REFERENCES text(id),
-  dependency_object_id INTEGER NULL CONSTRAINT dependents_index_fk2 REFERENCES hash(id),
+  dependency_object_id INTEGER NULL CONSTRAINT dependents_index_fk2 REFERENCES object(id),
   dependency_component_index INTEGER NULL,
-  dependent_object_id INTEGER NOT NULL CONSTRAINT dependents_index_fk3 REFERENCES hash(id),
+  dependent_object_id INTEGER NOT NULL CONSTRAINT dependents_index_fk3 REFERENCES object(id),
   dependent_component_index INTEGER NOT NULL,
   CONSTRAINT dependents_index_c1 CHECK (
     (dependency_builtin IS NULL) =