Fixes #665 - change URIs to IDs