Do not use regex to query by object ids

Merge this in at your leisure.