Don't rely on lastOrderId

Provides a more accurate way of getting new orders