Some references to LookupRef.id() were not updated to use LookupRef.uri()
Merge branch 'add-ids-to-lookup-refs' into stage