Fix incorrect key lookup on WhereIdMatches

[Turnerj]

With the new mapping change, the Id was looked up only on the specific entity definition, not any parent definitions. This would cause problems with derived types.