SCHEMA-3. Update uses of changed EntityId API.

Signed-off-by: Aaron Kimball <aaron@wibidata.com>