LookupRef.id is now LookupRef.uri
Merge branch 'add-ids-to-lookup-refs' into stage