Resolving Singularities of Orders on Surfaces