Move the "id" regex to a route pattern.

This is a much easier approach to ensuring that all routes with {id} have the regex applied to them.