Replaced the base URI kludge in generate-id